From 373cbb13be67a5bc9488387e46f3bd45afc7b9e8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 28 Apr 2006 14:32:09 +0000 Subject: [PATCH] Don't force the standard DND icon if the user has a custom DND source. 2006-04-28 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force the standard DND icon if the user has a custom DND source. (#339522, Joe Wreschnig) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtktreeview.c | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fd37f76e2..317c2780cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-28 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force + the standard DND icon if the user has a custom DND source. + (#339522, Joe Wreschnig) + 2006-04-28 Michael Natterer * gtk/gtktextbuffer.c (create_clipboard_contents_buffer): keep a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1fd37f76e2..317c2780cb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-04-28 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_drag_begin): Don't force + the standard DND icon if the user has a custom DND source. + (#339522, Joe Wreschnig) + 2006-04-28 Michael Natterer * gtk/gtktextbuffer.c (create_clipboard_contents_buffer): keep a diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 49ff9937f2..1fff6384ff 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6271,11 +6271,14 @@ gtk_tree_view_drag_begin (GtkWidget *widget, GtkTreePath *path = NULL; gint cell_x, cell_y; GdkPixmap *row_pix; + TreeViewDragInfo *di; tree_view = GTK_TREE_VIEW (widget); - /* if the user uses a custom DnD impl, we don't set the icon here */ - if (!get_info (tree_view)) + /* if the user uses a custom DND source impl, we don't set the icon here */ + di = get_info (tree_view); + + if (di == NULL || !di->source_set) return; gtk_tree_view_get_path_at_pos (tree_view, -- 2.30.2